Merge remote-tracking branch 'origin/master' into feature/android

diff --cc configure.ac
Simple merge

diff --cc doc/lispref/commands.texi
Simple merge

diff --cc etc/NEWS
Simple merge

diff --cc lisp/international/fontset.el
Simple merge

diff --cc lisp/net/eww.el
Simple merge

diff --cc src/fns.c
Simple merge